96. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:48 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

96.1 Files compared

#	Location	File	Last Modified
1	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/code/Smartwave/Porto/Model/Config/Settings/Category	Columns.php	2015-09-27 13:13:04 +0000
2	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/code/Smartwave/Porto/Model/Config/Settings/Category	Columns.php	2015-09-27 13:13:04 +0000

96.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	30
Changed	0	0
Inserted	0	0
Removed	0	0

96.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

96.4 Active regular expressions

No regular expressions were active.

96.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Settings\Category;	2	namespace Smartwave\Porto\Model\Config\Settings\Category;
3		3
4	class Columns implements \Magento\Framework\Option\ArrayInterface	4	class Columns implements \Magento\Framework\Option\ArrayInterface
5	{	5	{
6	public function toOptionArray()	6	public function toOptionArray()
7	{	7	{
8	return [['value' => '2', 'label' => __('2 Columns')], ['value' => '3', 'label' => __('3 Columns')], ['value' => '4', 'label' => __('4 Columns')], ['value' => '5', 'label' => __('5 Columns')], ['value' => '6', 'label' => __('6 Columns')], ['value' => '7', 'label' => __('7 Columns')], ['value' => '8', 'label' => __('8 Columns')]];	8	return [['value' => '2', 'label' => __('2 Columns')], ['value' => '3', 'label' => __('3 Columns')], ['value' => '4', 'label' => __('4 Columns')], ['value' => '5', 'label' => __('5 Columns')], ['value' => '6', 'label' => __('6 Columns')], ['value' => '7', 'label' => __('7 Columns')], ['value' => '8', 'label' => __('8 Columns')]];
9	}	9	}
10		10
11	public function toArray()	11	public function toArray()
12	{	12	{
13	return ['2' => __('2 Columns'), '3' => __('3 Columns'), '4' => __('4 Columns'), '5' => __('5 Columns'), '6' => __('6 Columns'), '7' => __('7 Columns'), '8' => __('8 Columns')];	13	return ['2' => __('2 Columns'), '3' => __('3 Columns'), '4' => __('4 Columns'), '5' => __('5 Columns'), '6' => __('6 Columns'), '7' => __('7 Columns'), '8' => __('8 Columns')];
14	}	14	}
15	}	15	}